From a5678887ccb39790944a526500ed1f84e304698b Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 18 Mar 2008 13:13:31 +0000 Subject: [PATCH] stubdom: disable xen_blktap Signed-off-by: Samuel Thibault --- tools/ioemu/Makefile.target | 2 ++ tools/ioemu/hw/xen_machine_pv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target index a9ffb1de53..8f9a335316 100644 --- a/tools/ioemu/Makefile.target +++ b/tools/ioemu/Makefile.target @@ -430,7 +430,9 @@ VL_OBJS+= cirrus_vga.o parallel.o acpi.o VL_OBJS+= usb-uhci.o smbus_eeprom.o VL_OBJS+= piix4acpi.o VL_OBJS+= xenstore.o +ifndef CONFIG_STUBDOM VL_OBJS+= xen_blktap.o +endif VL_OBJS+= xen_platform.o VL_OBJS+= xen_machine_fv.o VL_OBJS+= xen_machine_pv.o diff --git a/tools/ioemu/hw/xen_machine_pv.c b/tools/ioemu/hw/xen_machine_pv.c index 8ebb97e88c..5cf5a695d4 100644 --- a/tools/ioemu/hw/xen_machine_pv.c +++ b/tools/ioemu/hw/xen_machine_pv.c @@ -45,8 +45,10 @@ static void xen_init_pv(uint64_t ram_size, int vga_ram_size, char *boot_device, extern int domid; +#ifndef CONFIG_STUBDOM /* Initialize tapdisk client */ init_blktap(); +#endif /* Connect to text console */ if (serial_hds[0]) { -- 2.30.2